From: Florian Müllner <fmuellner@gnome.org>
Date: Sun, 25 Mar 2018 16:39:37 +0000 (+0200)
Subject: worldClock: Handle named timezones
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~970^2^2~5
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=11ca8dd54f2eefeff239bd51a0d8f616919900ee;p=gnome-shell.git

worldClock: Handle named timezones

The original UTC support in GWeather piggy-backed on the existing API, but
as "country" or "city" don't make sense in the context of UTC or AoE, the
concept of "named timezones" was introduced. Handle those explicitly to get
back labels for those locations.

https://gitlab.gnome.org/GNOME/gnome-shell/issues/150
---

diff --git a/js/ui/dateMenu.js b/js/ui/dateMenu.js
index 08ac28872..60f5bdc45 100644
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@@ -153,8 +153,10 @@ var WorldClocksSection = new Lang.Class({
         for (let i = 0; i < this._locations.length; i++) {
             let l = this._locations[i].location;
 
+            let name = l.get_level() == GWeather.LocationLevel.NAMED_TIMEZONE ? l.get_name()
+                                                                              : l.get_city_name();
             let label = new St.Label({ style_class: 'world-clocks-city',
-                                       text: l.get_city_name(),
+                                       text: name,
                                        x_align: Clutter.ActorAlign.START,
                                        x_expand: true });